From: H. Peter Anvin <hpa@linux.intel.com>
Date: Thu, 22 May 2014 00:38:22 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~6488^2~13^2~3
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=94aca80897501f994c795cffc458ecd0404377c7;p=linux-4.9.git

Merge remote-tracking branch 'origin/x86/urgent' into x86/vdso

Resolved Conflicts:
	arch/x86/vdso/vdso32-setup.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

94aca80897501f994c795cffc458ecd0404377c7